Merge tag 'upstream/2016.5' into debian/master
authorSimon McVittie <smcv@debian.org>
Sat, 16 Apr 2016 21:22:20 +0000 (22:22 +0100)
committerSimon McVittie <smcv@debian.org>
Sat, 16 Apr 2016 21:22:20 +0000 (22:22 +0100)
Upstream version 2016.5


Trivial merge